(display_text_line): Don't overrun the charstart area.

diff --git a/src/xdisp.c b/src/xdisp.c
index c67eeea232a27b33075427973f622f9e5dd3d1ab..4369f5154beefdfde44c70b12490dfb38f71ec52 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2309,7 +2309,7 @@ display_text_line (w, start, vpos, hpos, taboffset)
          if (p1 != p1prev)
            {
              int *p2x = &charstart[p1prev - p1start];
-             int *p2 = &charstart[p1 - p1start];
+             int *p2 = &charstart[(p1 < endp ? p1 : endp) - p1start];
 
              /* The window's left column should always
                 contain a character position.